fix(AssetController): refactor Snap data source by Kriys94 · Pull Request #7764 · MetaMask/core

Kriys94 · 2026-01-28T17:36:06Z

Explanation

This PR simplifies and cleans up SnapDataSource by:

Dynamic snap discovery via PermissionController: Instead of hardcoded snap registry entries, SnapDataSource now dynamically discovers installed snaps that have the endowment:keyring permission and extracts their supported chain IDs from permission caveats. This makes the data source more flexible and extensible for future snaps.
Simplified fetch routing: Changed from complex chain-based routing to account-based routing using account.metadata.snap.id. This aligns with how MultichainBalancesController handles snap accounts and is more direct since each account already knows which snap it belongs to.
Added KeyringClient: Replaced manual SnapController:handleRequest calls with KeyringClient from @metamask/keyring-snap-client, which provides cleaner typed methods (listAccountAssets, getAccountBalances). This follows the same pattern used in MultichainBalancesController.
Removed unused/redundant code:
- Removed DEFAULT_SNAP_POLL_INTERVAL constant (never used)
- Removed #groupChainsBySnapId method (no longer needed with account-based routing)
- Removed #fetchFromSnapById method (inlined into fetch)
- Removed #accountSupportsChain method (unused after simplification)
- Removed redundant chain filtering in fetch (already done by middleware/subscribe callers)
- Removed unused InternalAccount import
Used proper types: Replaced inline type Record<string, { amount: string; unit: string }> with GetAccountBalancesResponse and Balance from @metamask/keyring-api.

Dependencies added:

@metamask/keyring-api: For Balance and CaipAssetType types
@metamask/keyring-snap-client: For KeyringClient to make typed snap calls

References

Related to the SnapDataSource dynamic snap discovery refactoring
Pattern aligned with MultichainBalancesController and MultichainAssetsController implementations

Checklist

I've updated the test suite for new or updated code as appropriate
I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate
I've communicated my changes to consumers by updating changelogs for packages I've changed
I've introduced breaking changes in this PR and have prepared draft pull requests for clients and consumer packages to resolve them

Note

High Risk
High risk because it changes SnapDataSource discovery/routing behavior and removes the snapProvider dependency and many exported constants/types, which may break consumers and alter which chains/accounts get queried for balances.

Overview
Refactors SnapDataSource to use dynamic snap discovery instead of a hardcoded Solana/Bitcoin/Tron registry: it now queries SnapController:getRunnableSnaps and PermissionController:getPermissions to build a chainToSnap map from the endowment:assets chainIds caveat, and keeps activeChains empty until discovery succeeds (re-running on PermissionController:stateChange).

Simplifies balance fetching to be account-driven by using account.metadata.snap.id and calling snap keyring methods via KeyringClient (@metamask/keyring-snap-client) over SnapController:handleRequest, plus updates event filtering and cleanup/unsubscribe logic accordingly.

Updates initialization to delegate the new Snap/Permission controller actions/events, removes snapProvider from initDataSources options/tests, trims Snap exports from index.ts, and adds new dependencies/tsconfig references for permission/keyring snap support.

^{Written by Cursor Bugbot for commit 0376a35. This will update automatically on new commits. Configure here.}

FrederikBolding · 2026-01-29T11:55:20Z

+      const snapSupportsRequestedChains = request.chainIds.some(
+        (chainId) => this.state.chainToSnap[chainId] === snapId,
+      );


I don't fully understand how this is supposed to work. What if the chainToSnap mapping isn't already populated? Are the inputs BIP-44 account groups or individual accounts?

chainToSnap is populated at the initialization of MetaMask, much before that we are fetching assets. So What if the chainToSnap mapping isn't already populated? is unlikely to say impossible.

Are the inputs BIP-44 account groups or individual accounts?
request.accounts is the selected account group

Prithpal-Sooriya

Approving on first pass. This data source is completely new and not in production (we have time to refine).

Lets have the snaps team to review before merging. Maybe a short loom/recording to walkthrough changes?

FrederikBolding · 2026-01-30T11:01:34Z

-    const configuredNetworks =
-      options.configuredNetworks ?? ALL_DEFAULT_NETWORKS;
-
    super(SNAP_DATA_SOURCE_NAME, {


Not necessarily Snaps-related, but I think you should loop in @mcmire to look at the DataSource architecture. We should ensure that this pattern is aligned with the approach we generally want for data services.

@FrederikBolding: Thanks for the mention, @Kriys94 messaged me privately about the DataSource code in AssetsController code. I'm looking through it now to understand how it all fits together. @Kriys94: I'll let you know when I have something to share.

I have a diagram about what we are trying to build https://consensyssoftware.atlassian.net/wiki/spaces/PRDC/pages/400284352527/Architecture+proposal+34+AssetsController+the+cross-network-asset-type+controller#High-Level-Architecture

Here we call "data source" a piece of logic that extends the AssetsController and implements a specific interface to work with external services (Backend REST APIs, Snap, RPC). The code is related to the business logic, here assets balance, price and metadata.

For @mcmire and this ticket https://consensyssoftware.atlassian.net/browse/WPC-26, I think it refers more to a new service/client I just implemented in core-backend https://github.com/MetaMask/core/tree/main/packages/core-backend#http-api . The code in core-backend is agnostic form business logic.

In any case, feel free to comment on the overall code :) It's not released yet so making a braking change is easy :)

FrederikBolding · 2026-02-02T10:04:45Z

+    const cachedClient = this.#keyringClientCache.get(snapId);
+    if (cachedClient) {
+      return cachedClient;
+    }


cursor

Cursor Bugbot has reviewed your changes and found 2 potential issues.

Kriys94 added the no-changelog label Jan 28, 2026

Kriys94 force-pushed the fix/CleanSnapDataSource branch 2 times, most recently from 7238184 to 58befda Compare January 29, 2026 10:34

Kriys94 requested a review from FrederikBolding January 29, 2026 10:41

Kriys94 marked this pull request as ready for review January 29, 2026 10:41

Kriys94 requested review from a team as code owners January 29, 2026 10:41

Kriys94 force-pushed the fix/CleanSnapDataSource branch from 58befda to edad4fe Compare January 29, 2026 10:43

cursor Bot reviewed Jan 29, 2026

View reviewed changes

Comment thread packages/assets-controller/src/data-sources/SnapDataSource.ts

Comment thread packages/assets-controller/src/data-sources/SnapDataSource.ts Outdated

Comment thread packages/assets-controller/src/data-sources/SnapDataSource.ts

FrederikBolding reviewed Jan 29, 2026

View reviewed changes

Comment thread packages/assets-controller/src/data-sources/SnapDataSource.ts Outdated

FrederikBolding reviewed Jan 29, 2026

View reviewed changes

Comment thread packages/assets-controller/src/data-sources/SnapDataSource.ts Outdated

FrederikBolding reviewed Jan 29, 2026

View reviewed changes

Kriys94 force-pushed the fix/CleanSnapDataSource branch from edad4fe to b6be0e0 Compare January 29, 2026 13:10

cursor Bot reviewed Jan 29, 2026

View reviewed changes

Comment thread packages/assets-controller/src/data-sources/initDataSources.ts Outdated

Kriys94 force-pushed the fix/CleanSnapDataSource branch 3 times, most recently from bbc3ea1 to 92d01fb Compare January 29, 2026 14:45

Prithpal-Sooriya previously approved these changes Jan 29, 2026

View reviewed changes

FrederikBolding reviewed Jan 30, 2026

View reviewed changes

Comment thread packages/assets-controller/src/data-sources/SnapDataSource.ts Outdated

FrederikBolding reviewed Jan 30, 2026

View reviewed changes

Comment thread packages/assets-controller/src/data-sources/SnapDataSource.ts Outdated

FrederikBolding reviewed Jan 30, 2026

View reviewed changes

Comment thread packages/assets-controller/src/data-sources/SnapDataSource.ts Outdated

FrederikBolding reviewed Jan 30, 2026

View reviewed changes

Comment thread packages/assets-controller/src/data-sources/SnapDataSource.ts

FrederikBolding reviewed Jan 30, 2026

View reviewed changes

Comment thread packages/assets-controller/src/data-sources/SnapDataSource.ts

Kriys94 dismissed Prithpal-Sooriya’s stale review via 82d66c0 January 30, 2026 16:39

Kriys94 force-pushed the fix/CleanSnapDataSource branch from 92d01fb to 82d66c0 Compare January 30, 2026 16:39

cursor Bot reviewed Jan 30, 2026

View reviewed changes

Comment thread packages/assets-controller/src/data-sources/initDataSources.ts

Kriys94 force-pushed the fix/CleanSnapDataSource branch from 82d66c0 to 1d3ed84 Compare January 30, 2026 19:04

fix(AssetController): refactor Snap data source

ad81bb1

Kriys94 force-pushed the fix/CleanSnapDataSource branch from 1d3ed84 to ad81bb1 Compare January 30, 2026 19:20

FrederikBolding reviewed Feb 2, 2026

View reviewed changes

Comment thread packages/assets-controller/package.json

FrederikBolding reviewed Feb 2, 2026

View reviewed changes

FrederikBolding previously approved these changes Feb 2, 2026

View reviewed changes

cursor Bot reviewed Feb 2, 2026

View reviewed changes

Comment thread yarn.lock

Comment thread packages/assets-controller/src/data-sources/SnapDataSource.ts

Kriys94 dismissed FrederikBolding’s stale review via ad81bb1 February 2, 2026 10:34

Kriys94 force-pushed the fix/CleanSnapDataSource branch from 15b4bd4 to ad81bb1 Compare February 2, 2026 10:34

FrederikBolding approved these changes Feb 2, 2026

View reviewed changes

Kriys94 added 2 commits February 2, 2026 11:42

Merge branch 'main' into fix/CleanSnapDataSource

e6456e5

Merge branch 'main' into fix/CleanSnapDataSource

0376a35

Prithpal-Sooriya approved these changes Feb 2, 2026

View reviewed changes

Kriys94 added this pull request to the merge queue Feb 2, 2026

Merged via the queue into main with commit 297e96e Feb 2, 2026
302 checks passed

Kriys94 deleted the fix/CleanSnapDataSource branch February 2, 2026 11:12

Uh oh!

Conversation

Kriys94 commented Jan 28, 2026 • edited by cursor Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation

References

Checklist

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

FrederikBolding Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

Kriys94 Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Prithpal-Sooriya left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

FrederikBolding Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

mcmire Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

Kriys94 Jan 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Kriys94 Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

FrederikBolding Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Kriys94 commented Jan 28, 2026 •

edited by cursor Bot

Loading

Kriys94 Jan 30, 2026 •

edited

Loading